afb27d05c34100aa15d1ae8c8d6ecce7a00a5699,src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java,ToolsMenu,registerMenuItems,#,287

Before Change


        // We only add the options button if the property SHOW_OPTIONS_WINDOW
        // specifies so or if it's not set.
        Boolean showOptionsProp
            = GuiActivator.getConfigurationService()
                .getBoolean(ConfigurationFrame.SHOW_OPTIONS_WINDOW_PROPERTY,
                            true);

        if (showOptionsProp.booleanValue())
        {
            UIService uiService = GuiActivator.getUIService();
            if ((uiService == null) || !uiService.useMacOSXScreenMenuBar()
                || !registerConfigMenuItemMacOSX())
            {
                registerConfigMenuItemNonMacOSX();
            }
        }

        conferenceMenuItem = new JMenuItem(
            GuiActivator.getResources().getI18NString(
                "service.gui.CREATE_CONFERENCE_CALL"));

        conferenceMenuItem.setMnemonic(GuiActivator.getResources()
            .getI18nMnemonic("service.gui.CREATE_CONFERENCE_CALL"));
        conferenceMenuItem.setName("conference");
        conferenceMenuItem.addActionListener(this);
        this.add(conferenceMenuItem);

        initVideoBridgeMenu();

        if(!GuiActivator.getConfigurationService().getBoolean(
            AUTO_ANSWER_MENU_DISABLED_PROP,
            false))
        {

After Change


    {
        // We only add the options button if the property SHOW_OPTIONS_WINDOW
        // specifies so or if it's not set.
        ConfigurationService cfg = GuiActivator.getConfigurationService();
        Boolean showOptionsProp
            = cfg.getBoolean(
                    ConfigurationFrame.SHOW_OPTIONS_WINDOW_PROPERTY,